Manual merge of version 1:14.0.6-9+rpi1 and 1:14.0.6-10 to produce 1:14.0.6-10+rpi1

diff --cc debian/changelog
index 7a701fde719331a4308a77ebfb3499bd2af107c2,cade9a77102b0a59c983235410e0e40a42253a16..b2cd96eaa5e580ea73143b89cecf0ab7bc30e358
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,64 +1,111 @@@
- llvm-toolchain-14 (1:14.0.6-9+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-14 (1:14.0.6-10+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
 +  * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 +
 +  [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
 +  * Disable scudo on armhf, it needs atomics which we do not want to enable.
 +
 +  [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
 +  * Remove armhf from architecture list for libunwind-13-dev dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Dec 2022 06:12:41 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 12 Jan 2023 18:05:13 +0000
++
+ llvm-toolchain-14 (1:14.0.6-10) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * Add missing epoch (Closes: #1027699)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Jan 2023 15:42:15 +0100
+ 
+ llvm-toolchain-14 (1:14.0.6-10~exp6) experimental; urgency=medium
+ 
+   * Move libPolly in libpolly-X.Y-dev for real
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Jan 2023 15:42:04 +0100
+ 
+ llvm-toolchain-14 (1:14.0.6-10~exp5) experimental; urgency=medium
+ 
+   * Create a libpolly-X.Y-dev package
+   * Fix the libclang-rt-14-dev-wasm64 description
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 28 Dec 2022 12:35:04 +0100
+ 
+ llvm-toolchain-14 (1:14.0.6-10~exp4) experimental; urgency=medium
+ 
+   * Move the compiler-rt content into a new package called
+     libclang-rt-X.Y-dev (including polly)
+   * the wasm targets are shipped into libclang-rt-14-dev-wasm32
+     and libclang-rt-14-dev-wasm64
+   * libclang-common-X.Y-dev arch moved to all
+     then ${binary:Version} => ${source:Version}
+     to avoid not-binnmuable-any-depends-all
+   * link-grpc.diff: add the detection of other libs necessary for
+     grpc (Closes: #1025529)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 21 Dec 2022 13:48:40 +0100
+ 
+ llvm-toolchain-14 (1:14.0.6-10~exp3) experimental; urgency=medium
+ 
+   * Transform debian/control into debian/control.in (preparation for
+     flang support)
+   * Do not install wasm-libc if doesn't exist
+ 
+   [ Faidon Liambotis ]
+   * Try to unbreak the builds with wasm
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 19 Dec 2022 11:09:58 +0100
+ 
+ llvm-toolchain-14 (1:14.0.6-10~exp1) experimental; urgency=medium
+ 
+   * More WebAssembly (wasm32/wasm64) work:
+     - Update patch wasm-sysroot-usr to stop including /usr/include when
+       building for the non-OS (unknown) wasm targets, to avoid inadvertently
+       including the host's (glibc) headers.
+     - Re-enable builds on all architectures, previously disabled for
+       arm64 armel mips64el mipsel ppc64el armhf in 1:14.0.6-4, due to an FTBFS
+       related to the /usr/include issue above.
+     - Update patch wasm-sysroot-usr to adjust system include paths for C++
+       headers as well.
+     - Build libc++ and libc++abi for wasm32-wasi, generating two new binary
+       packages, and introducing a build dependency on wasi-libc.
+     - Misc code organization fixes to debian/rules.
+ 
+  -- Faidon Liambotis <paravoid@debian.org>  Fri, 18 Nov 2022 08:21:02 +0200
  
  llvm-toolchain-14 (1:14.0.6-9) unstable; urgency=medium
  

diff --cc debian/control
index 40b89d28ce74a72220b3cea92f517bc9e0e97457,8ececdbf4faa4bdb6740ddda51f39ebad5fd399a..82f8a98667494022741f4b4f079574db748623d0
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -16,13 -16,15 +16,14 @@@ Build-Depends: debhelper (>= 10.0), cma
      lcov, procps, help2man, zlib1g-dev,
      g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
      libjs-mathjax, python3-recommonmark,
-     doxygen, gfortran,
+     doxygen,
      ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
 +    ocaml-findlib [amd64 arm64 armhf ppc64el s390x],
 +    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
 +    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
      libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
      llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
 -    spirv-tools [ linux-any ] | hello [ !i386],
+     wasi-libc | hello [ !i386],
      libcurl4-dev,
      libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
      protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

diff --cc debian/patches/series
index 430227fed589cdb04a3b9b7df4b37bdcf19e6a71,bb79f0a8fcfe32615fd4ac16e8db2f8d791a9a99..e8f27bae54edc5d7420f29b396e6403fbce3b7f4
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -132,4 -161,4 +132,5 @@@ lldb/lldb-swig.dif
  lldb/lldb-swig-2.diff
  protobuf_3.21.patch
  basic_string.patch
+ link-grpc.diff
 +raspbian-triplet.patch

diff --cc debian/rules
index 65af41124f8736a0945c5ce72901a33c91a0c0ea,09fc3b791d381d769e876d08f27d6813d9618c90..c0adf6cbe634ae60d44d5164122339b7bdfa9b8a
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -834,9 -910,9 +923,10 @@@ endi
                cd openmp/runtime && doxygen doc/doxygen/config; cd -; \
                cd openmp/runtime/doc/doxygen/generated/html/ && rm jquery.js && ln -s /usr/share/javascript/jquery/jquery.js; \
        fi
+       touch $@
  
  override_dh_auto_install:
 +      mkdir -p build-llvm/docs/ocamldoc/html/
        # Clean up temporary files to make sure the install works
        rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d)
        # install/fast enables a make install without recompiling temporary files